Updated to reflect new features.