Merged Siggi's comments