improved auto-advance