properly added mixins
updated mixins