refactoring and updating demo
refactoring