modified partition by columns