Update from neuecc