Some work on 7.3.1