Updated with new comments