update to using new globals