new version for table bugs