Re-adding 3.2 stuff so I get credit for doing the lab