Removed MSM stuff x2