First working version
Removed mock measurement