Added code for 3.2 (two versions), 3.3, and 3.4