Overhaul to hopefully make everything all better