Improved concurrencly control and clarity

Change-Id: I2dca6593862a2d35607008eefc9e3b3490b95171