Continued work on e1.31