Agent Update - issue 63