some restructuring and rewriting of time step coupling