Some further changes - far from complete