assignment2 edited