removed problematic mixin and compiled previous additions