updated mixins with new and improved