updated to new columns format