Finished the assignement