update to use with afn 2.0