Merged in Leigh's notes