Changes for 3.3 that work!