simplified how we handle end states.