Continued work on e1.24