Added return handler
Merge