modified for timing