My version of assignment 2