Regularised Patch 240 to accommodate state changes as it were then