Artem's changes