updated
updated to latest caf 2.6