Updating based on good comments by Rich