made changes for dan