Updated with notes and quota function repair