More block differentiation work