edits to mixins