Overhauled everything