updated ictd handling