Removed globals yay!