UPDATED COMMENTS SHIT