Progress with transition to 2.3.3