Added comments
Some update