small changes during work on afbo