Return values need to be updated as well.