Modifications for normalisation completed (still not tested)