Update from Riccardo ~ 24 Feb 2022