Mainly change doneHandler -> completionHandler
Small fix