Added Neon EDS
Incremental update: NOT TESTED / NOT WORKING