made mixin more modular - thxs @mhelvens