code changes in d7c5