small changes for afbo