Updated code to meet 3.3 standards