Just some reshuffling and thinking