todo update and delay revised