Added cole's suggestions.