Overhaul to make everything all better