Updated loading of demo and program