changed some variables
changed some vars