Improved normalisation