Latest changes

Sync up before the meeting.