redid changes from earlier...no errors