Added Almar's suggestions.