[READY] Better normalisation