Altered demo and fixed display error