Phase 4.7

Fix bug afc call. Finish phase 4.7