modified variables to fit tobi styles
modified variables