reworked fileds in the table