Add Trevor's suggestions.