copy pasted my code in from github website
fixed merging issues