modifying for 3.3