global variables defined in one place
merged changes