Implemented buffers for globals, preliminary changes on measure