repackaged and removed field bases