More edits, synching with other system.