Improved checknodes