Major overhaul and simplification