Issue 406 gnd scripts