from luca tironi deleted fork