TASK19

Made corrections in previous version in order it work as it should