Pre Demo Changes