Re-implement auto-next