updated commit as per Artem's comments May 29