Tiny changes before the clean up