Overhaul to simplify the project