Joint deconvolution now basically working