pavel's tweaks