Removing Globals, moving to OBO fucn