new diff file with changes from capella

integrates #13, ready for review