Major overhaul to make it work better