rebuild after hammer refactor