merging di's changes