Added the rest of the assignment