Demo fixes
Refactoring
Refactoring 1
Refactoring done
0.3.6