Moved global variables
new fix