Assignment 2 resubmission