Started working on combined demo again.