removed singleton behaviour