Removed use of getNDPosition
Removed wrapping constructor and hardened equals method