updating all of my previous changes