Completed

changes in design and new tasks