tweak analysis a bit more