added some columns
merging commits