1.5 production refactor