Handle more of the approprate end states