New version for CSWS Demo track