Added edison-2