#315 Moar script adaptation.