Adding the modifications done in class (10/10/2013)