some changes that Chris and Dave made