More updates to refactor slides