Added D and E