adding in changes from professor