No more locks, this seems to work!