Changed some key variables to reduce risk