Updated BSM and Security check