added mixins and blocks