updates according to latest AN