Fix update all function to update in the correct order before the code clean up happened