improved timing and physics