updating with whateve i did since the last commit