Updated for new internet stuff