Changes withCompletion to onCompletion