Redesigned the table