* 3.3 changes