Added Edison code