Updated to match Ilargia updates