Added Security Check