Pulled correct code from demo's github