changed the calling of SINGLETON to a more readable way.