added question marks and a toggle