Addressed comments from @gvwilson