Updated to mixins