update for catching up 3023 + fix outdated problem