jancuk and papirus patches added