My initial 3.3 implementation.