Update pods, continue refactor