SquareDemo -> UniversalDemo