code change for d7rebase