Quote system huge update