save work with lots of fixes