yet another round of timing tweaking