Updated to reflect current code changes.