updated with more demos