renamed some variables...