More work on completion