rehaul of code integration