Add changes
Add changes from Frederik