logic enhancement and more samples