- revised node and property view