Completed the assignment V1.0