heartbeat customization
merged conflicts
added feature for heartbeat