First progress on managing quotes