Updated Demo A Bit