Made some changes so that the code can be run without compile time errors
Merging conflicts