Apply Jeremys suggestions.