addressed one of the comments from Nick