updated thesis, work