Tadej's hacks