Heartbeat improvements

Awesome solution! :+1: