final bug fix. DEMO TIME!