[Update]: Finishing task. Small updates. [ArtyomRusak]