Updated to reflect latest changes in zerklabs/auburn