Added measurement
Some more stuff gone