Some optimisation on the profiles. #20