Changed some varaibles