Refactored to use Hot Towel