More work on the completion worker