WIP for the revised table
Removing old code
WIP