could this be consolidated to the conditional on line 211 above?