Improve amf around.