demo and jsx fix