update for the other 2 cases too