Reworked task

Kiril while i was off line made some chages...