#1 fix - add locks