Updated with latest notes