Shouldn't the timeout be related to the timer somehow? It seems like we are running @update() a little too much...