Fixed UTG code, will try to abstract wrap around