Revert "Revert "introduced noTone and map functions, and upgrade tone function""

This reverts commit 3114e27af9d63462a3a8097e82f4d1e2c96c40dd.