Solved the assignment