Refactored, multi columns