7.12.13 code changes