Added torch, vanilla one will not be replaced any more