Incorporated heartbeat feedback refs #35