Assignment 4 redo