Feature simple table update

Fixing merge conflicts with head.