mid-way through rebuilding for new design