more code changes