Update and CleanUp