edited colum, make refactor