made demo run and simplified it