More improvements to Assignment 2, Part 1