shane-suggested tweaks