Same changes to our code as in the other repo