Added comments for Grant and Hannes