AP to be replaced by TS