added mixin logic