changes for 4.02, and more