e2.c modified