More code changes