Made edit for apmd