further work harmonising defs