changes for did. not finished. just moving on for now