changing deprecated code to use mixins.  again.