All core componenets normalised on NS now