Massive overhaul of the project