Updated comments to reflect new direction