Updated to latest Nodelike