Updated to reflect the new changes from zerklabs/auburn