Version 2 for CSC220 HW1