add in Michal's comments