All dsp, restructuring and updated