Minor changes so that the functionality can be demoed