some changes to prepare team APs