changed api again, and more with demo