Making changes for demo