added columns and stuff