Use separate columns to prevent shifting temporarily