Assignment 10 redo