Added some comments and annotations