removed some variables that are not needed