more consistency in the_end management