More attempts at working 3.1.