updating david's changes