2.3 code changes