tidied mixins
not dummy anymore