completion handler tweaks