changes from brandon's review