MAJOR design overhaul