further changes to improve quota usage