Completed implementation of e3.06