Updated to reflect the latest changes in zerklabs/auburn