add args to mixin
Merge branch 'mixins' into latest