Beginning to fix the security