updated for timing