rejig some things