Fixed tone/noTone issues and Tested successfully
Moved tone/noTone into a separate source file