Updates based on notes in Basecamp