more code changes from offshore