Done Some Update coading to Quotation