Updated to 3.3 syntax