Updated with more notes