Added some comments/annotations