latest changes for working demo