re-arranging things a little