Updated with my course/research notes