Edits suggested by niko.