Some timing changes