added 'Center of Mass' support