Adjust with comments from rjackson