improvement to nodeclass