Make assignment 1 work