fixed bug from changing variable namees