Added quote functionality
moved quotes