Update

Credits to Kristof for security check