@tjfontaine please rereview