lots of changes, lost track... measurements work :)