More work on amf saving.