huge mixins update