Keep both versions up to date