code changes for better diff