Modified implementation to use newer global system.