Changed code to move the separation out savely, closes #33