Updated that Comment FUNCTIONALITY