Improved quote system