Changed Ms to Ns and structure change