table changes
Merge branch 'mikkelmaster'