Changed some variables to make it easyer