Another reworking to say goodbye to a rubbish year for all :(