david's changes