General rejig as we start the move to rcm