removed scaletest; updated timer