Continued work on e2.39