added Security Checks