more e2, still not complete