updated and pulled out some work related stuff