Done all tasks

Needs review