Quote Tool Enhancement