Complete overhaul of the process