Updates and some rationalisation