Preparing for demo 1
Refactoring to change file name