Reorganized table, fixed #5