More work on the new agent