Put more stuff in critical section..