add another completion handler
Merge branch 'monards'