full commit, just about to plot P_OUT, changes are expected to be made