still cleaning up after 'tidying'