changes from personal laptop
completing merge