Changes needed here based on new function names.