Changes in agent/agent.c