merge back end changes with D2