Attempting to standardise the ES checks