initial code changes