Changes for homework assignment