2-149 implemented first series of Tero's comments