this version has been contributed to Indigo RC1