more changes from original NME ...