Turned simple nodes into a single macro