re-build
send correct heartbeat, add punisher