many changes to bring in d2