VM-2 changing the code according to last commits' feedback