Changes made getting ready for heartbeat