addition of stefan's EDX extensions