major code and design overhaul