Reflect comments from ssorallen