change content to table
add group check
fix error