Removing the call from the main source file, adding on the demo