Improved Handler and Sending