Updated version (for hugging change)