added MessageTracker, changed starthandler
added else to starthandler