added stuff from Laurent (iWeb)