Now uses native comment function