got rid of singleton