New class Statistic, some fix. But more bad code...linked with time