Assignment 2 revisited