added Artem changes