Better reverse/stay handling logic