Added return functions
Merged