Added some changes that Artem made