made some changes
added variables to control previous changes@