New refactor build