fsms
merging erlend and new