Adjusted updated functions to work like previous version, pending inclusion of comment_id in loop.