Agent added, main organized