David's changes

added and deleted stuff