more normalisation, almost done