Changed to cleaner condition.