Re-worked comments