Overhauled and organized