question marks handling added