Final commit for security question