added variables and other changes