changing mixins
minor modifications