adding some more checks we use on a regular