Adding comments
changes
adding exception handling