got rid of that singleton nonsense