Got kevins code
Fixed conflicts in code