Code updated from meeting with Charlotte.