More work on 7.8.1