Implementing comments as per #2