changes due to marek comments