original work plus some cleaning