Rejigger all the things