added columns and neat