changed some variables names