Updated to reflect new functionality.