Added efficient and appropriate blocking