Completed e2.30
Added definitions for e2.31 - e2.32