I believe I have vanquished the evil race condition
add underscore
easiest merge ever