implemented marek comments