Added quote return logic