Address feedback from Ben Campbell