Finishing the assigment