Merge with ForceUniverse 3