Some update and redirect work