Add/fix amplitude modulation with feature detection