Moved harc handler code away from event handlers