1st pass after @uboness review