Completed e2.16, e2.18