added quotation handling