improve previous NDO conversions
NDOize some generic code