re-arranging things a bit