Added some more commentaries