added quote logic