dried up our code a fair bit