Update #AP11, #AP45