security and optimisation

security and optimisation