change as Artem's comments