updated var
added back old code just in case
removed old code