tweak setup a bit more per feedback from Aaron