finished upgrading to parameterized ExNode