Definitions are now merged
Tidying