Added additional contact checks