new mixin, indent imporvements