Lots of edits in DSPC - almost done