Debugging + modified measurement