More work on 7.2.1