Update based on GitHub comments