adds garrett's tweaks