Get the last bit correct and change demo location