getting stuff ready for merge