merged nader's word into the repo