Updated napkin parser