new version works
updated mixin