changes from Iguana applied