Is this change basically singleton instead of global?