fixing to make it 5.5 compliant
updates to make it 5.5 compliant