small changes, new mixin