adaption to ngs 6.0