Updated assignment D2

includes some simplifications to confirm to the example given with the assignment PDF