Assignment 2 revamp