Better columns
removed more
upd8