Added auto-reveal option