What's wrong with the suggestion I did ?
Applied to your workbook the result is exactly how you formulated it should be.