Completed

Project for katja7 -- 2