WP3: Added some comments