20200411 Refinements