@ericf feedback second pass.