david's changes done on Thursday afternoon/evening