some changes that david deleted