updating to support newer versions of AF