ADded Feature from Homework 1