refactored to the newwww style