More updates for new filehandle.