Nes integrate beta

Please merge it into the master