Refactoring...
Updated Demo project.