clean up some modeling
reorder some changes for simplicity
screw off, X column!