Some changes in previous work

Great and quick!

Review by iamolegmiruk
Invite to work