Removed respond to checks

Moved some logic around, trying to make the code a bit simpler