Added temp, weight, rewrote