realised the old gen version is easier for this, maybe i should improve the Lewa and Haaland times as well
