New settings, data collector improved