Credit where the credit is due
Adding caps and nonce check method