updating mixins and functions