made some changes made by david