added js + mixin