all changes for demo