Added more changes to Agent.h and Agent.cpp