Final version on AF EMR side for now