changes to main and fsd by Romaric