Changed to use addaf and addcaf