A few tweaks trying to speed things up