Updated to make changes presented in class