APT dynamics improvments.