finished davids changes