ISSUE-38 Center of Mass solutions