- removed usage of singleton (it's not threadsafe!)