Changed next state picker to favour UP moves as requested by design