merged code, slight change to eden_url fix