Updated FSP, closes #59