Preparing for table (need more test cases)