updated mixins and reset