get rid of singleton