Added 30 second mode