changed stuff, hopefully demo is not too unworking...fixing it...