Huge publish new refactor