Changed manual boxes to use mixins.