pre-final version of SBP paper
fixed merge conflicts