Updating for neko compatibility?