2-149 implemented Tero's comments