stop declaring global vars
merge