Reworking timeout and auto-advance.