Made basic working for live demo