Removed hostname; changed order of data