OK I'm adding more checks...