Added function calls to main
Merged changes