some changes that were suggested