Added quotation controls