updated mixin