working on publish new refactor