added extra features for demo