Updated for EDN and 1.6