Add Ivan's suggestions.