Slightly smarter timing logic