Added quote and other changes