Added auto-cueing logic