Updated to code on first demo