Continuing work on 3.2