only a few changes on AFGs