Updated with notes section