wip/ap-choke
