Solved HW2, enhancement #1