final changes for demo