Fixed tables for @reaperjc