Data recolection use case improves...

Solved some bugs...

blabla...
bla...
...