Alterations according to Assignment 2 instructions.