Changed some variables