updated base and mixins