More updates for issue 5