Switched some demo tags