make lock narrower
rename issue
more reader writer locking