Added quote logic