Added a new mixin and changed a couple of others