revised organisation project
update and simplify the mixin