Fix for js error + new demo