Heartbeat update
Added things from heartbeat update