Daniel Passos updated Task AGIOS-588