more work tidying up the transitions