merging Marco's suggestions (not there yet)