Improved quotes