Expanded to reflect new functionality