Kristof's tweaks