AP modifications