Total overhaul of program