oops these changes didn't make it into the last commit