Some changes for demo