made adaptions to fit new column-options