Better modulation logic