HW Assignment 18 - 18c added