correct syntax for clumns
merged with upstream
design updates
finished design
fixed merge