Updated from notes