HandmadeParser improved