Blocks and partial logic changed.