Changing to use normalisation and scaling only