Updated to reflect the changes from auburn