- Small changes according to the last comments by Ed.