After initial code changes