Finished the assignemnt