updated now done with assignment 2