Changed the uml
Working on fix for addons
Reversed a condition..
Fixed conflict