revert some of Mixs changes
partial refactor