Changed timing units to ms