Updated with notes