Merge Sam Whitlock's notes