more changes for demo time