Finally adressing some of the comments from @scottgonzalez