Uar 626

New pull request for subtask 12 which is now resolved.